From: Tino Calancha <tino.calancha@gmail.com>
Date: Fri, 10 Feb 2017 11:05:11 +0000 (+0900)
Subject: ; Fix a typo in comment
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~22^2~44
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=3f7493e;p=emacs.git

; Fix a typo in comment

* lisp/vc/ediff-wind.el (ediff-setup-windows-multiframe-merge):
Fix a typo in comment.
---

diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el
index cd10288643d..eb76988293f 100644
--- a/lisp/vc/ediff-wind.el
+++ b/lisp/vc/ediff-wind.el
@@ -556,7 +556,7 @@ into icons, regardless of the window manager."
     (if (and (window-live-p wind-A)
 	     (null use-same-frame) ; implies wind-A is suitable
 	     (null use-same-frame-for-AB))
-	(progn ; bug A on its own
+	(progn ; buf A on its own
 	  ;; buffer buf-A is seen in live wind-A
 	  (select-window wind-A)
 	  (delete-other-windows)